store scale in percent

diff --git a/ChangeLog b/ChangeLog
index c49d33b8bf0ddff609e3f9620f4db1ac0f6ce70a..894a62adf5294247df225edc90115af80f962c18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-06-11  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkprintoperation-win32.c: Store scale as a percentage.
+       (#344560, Christian Persch)
+
        * gtk/gtkprogressbar.h: Add a dirty flag to GtkProgressBar.n/ 
        * gtk/gtkprogressbar.c: Defer updating of the offscreen
        pixmap until expose.  (#344543, Chris Wilson)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c49d33b8bf0ddff609e3f9620f4db1ac0f6ce70a..894a62adf5294247df225edc90115af80f962c18 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-06-11  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkprintoperation-win32.c: Store scale as a percentage.
+       (#344560, Christian Persch)
+
        * gtk/gtkprogressbar.h: Add a dirty flag to GtkProgressBar.n/ 
        * gtk/gtkprogressbar.c: Defer updating of the offscreen
        pixmap until expose.  (#344543, Chris Wilson)

diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c
index 8184846604eeb26826a75f4a2d17d3a39abcedb1..f47f763dc665a9ddf83fd95363e933577db55634 100644 (file)
--- a/gtk/gtkprintoperation-win32.c
+++ b/gtk/gtkprintoperation-win32.c
@@ -677,8 +677,7 @@ devmode_to_settings (GtkPrintSettings *settings,
     }
   
   if (devmode->dmFields & DM_SCALE)
-    gtk_print_settings_set_scale (settings,
-                                 devmode->dmScale / 100.0);
+    gtk_print_settings_set_scale (settings, devmode->dmScale);
   
   if (devmode->dmFields & DM_COPIES)
     gtk_print_settings_set_n_copies (settings,
@@ -959,7 +958,7 @@ devmode_from_settings (GtkPrintSettings *settings,
   if (gtk_print_settings_has_key (settings, GTK_PRINT_SETTINGS_SCALE))
     {
       devmode->dmFields |= DM_SCALE;
-      devmode->dmScale = gtk_print_settings_get_scale (settings) * 100;
+      devmode->dmScale = gtk_print_settings_get_scale (settings);
     }
   
   if (gtk_print_settings_has_key (settings, GTK_PRINT_SETTINGS_N_COPIES))